Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

inv_col: fix ground items stacking with veh items #56777

Merged
merged 1 commit into from
Apr 19, 2022

Conversation

andrei8l
Copy link
Contributor

Summary

None

Purpose of change

Items on the ground stack with items in a vehicle on the same tile
Fixes #56775

Describe the solution

Add an additional check

Describe alternatives you've considered

N/A

Testing

  1. Spawn a shopping cart
  2. Drop a rock on the ground
  3. Drag shopping cart over the rock
  4. Drop a rock in the shopping cart
  5. Put another rock in a plastic bag and drop the bag in the shopping cart too
  6. Open pick up menu and confirm that the rocks aren't stacked

Additional context

I introduced this bug in #56427

@github-actions github-actions bot added [C++] Changes (can be) made in C++. Previously named `Code` json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions labels Apr 13, 2022
@NetSysFire NetSysFire added Info / User Interface Game - player communication, menus, etc. <Bugfix> This is a fix for a bug (or closes open issue) labels Apr 13, 2022
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Apr 13, 2022
@toweroglass
Copy link

Did your original PR also change the way items are sorted in the 'i'ventory screen? I've been a little annoyed that things are no longer in alphabetical order.
I don't mind seeing a few different bandages in different pockets, but having to scan all of my inventory to see the others I have has been frustrating.

@andrei8l
Copy link
Contributor Author

andrei8l commented Apr 13, 2022

Did your original PR also change the way items are sorted in the 'i'ventory screen?

I changed that a while ago in #53373. Eventually I want to add support for arbitrary sorting and categorization to cover your use case too.

EDIT: btw, you can just filter for the thing you want with default key /

@toweroglass
Copy link

EDIT: btw, you can just filter for the thing you want with default key /

oh yeah i know that and use it often. just hinders my ability to quickly see what i'm looking for. not a huge deal tho and i look forward to what comes next.

@kevingranade kevingranade merged commit 6deba6c into CleverRaven:master Apr 19, 2022
@andrei8l andrei8l deleted the inv_col-add-entry-fix branch April 19, 2022 02:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` Info / User Interface Game - player communication, menus, etc. json-styled JSON lint passed, label assigned by github actions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Strange bug when dropping items into a full cargo tile.
4 participants